Skip to content

Syncthingtray#7712

Open
HuricanDev wants to merge 4 commits intogetsolus:mainfrom
HuricanDev:syncthingtray
Open

Syncthingtray#7712
HuricanDev wants to merge 4 commits intogetsolus:mainfrom
HuricanDev:syncthingtray

Conversation

@HuricanDev
Copy link
Contributor

Summary

Adds syncthingtray as well as all of it's dependencies.
Resolves #7361

Test Plan

Installed the package and went through the guided setup. Everything seems to be working as intended.

Checklist

  • Package was built and tested against unstable
  • This change could gainfully be listed in the weekly sync notes once merged

Copy link
Member

@malfisya malfisya left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Can you re-word the message on cpp-utilities commit. It is not descriptive enough at glance. Maybe something like "Remove foo rundeps and add optimize key" .

**Summary**

 - Removed unneeded rundeps (gcc + libstdc++)
 - Enabled clang and added speed + thin-lto optimise keys
@HuricanDev HuricanDev force-pushed the syncthingtray branch 2 times, most recently from bd2b484 to 1b33182 Compare January 29, 2026 05:55
source :
- https://github.com/Martchus/qtforkawesome/archive/refs/tags/v0.3.2.tar.gz : 9215162e9dd73eb64047de5f2a21c654ce8e6df2994ebe558b7fd7a31b28bb52
homepage : https://github.com/Martchus/qtforkawesome
networking: true
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Why does it need networking?

Copy link
Contributor Author

@HuricanDev HuricanDev Jan 30, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Networking is required because it pulls in fonts from Fork-Awesome if they're not manually provided. Should I be providing them manually as extra files instead?

For more context: https://github.com/Martchus/qtforkawesome?tab=readme-ov-file#providing-the-font-file

Copy link
Member

@EbonJaeger EbonJaeger Jan 30, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Hmm Yeah, I would like the project's source tarball added as a source, and then moved to the right place.

source     :
    - https://github.com/Martchus/qtforkawesome/archive/refs/tags/v0.3.2.tar.gz : 9215162e9dd73eb64047de5f2a21c654ce8e6df2994ebe558b7fd7a31b28bb52
    - https://github.com/ForkAwesome/Fork-Awesome/archive/refs/tags/1.2.0.tar.gz#fork-awesome.tar.gz : whatever the sha256sum of  the downloaded file is
setup      : |
    mkdir forkawesome
    tar -xf ${sources}/fork-awesome.tar.gz -C forkawesome

    %cmake_ninja \
        -DBUILD_SHARED_LIBS=ON \
        -DQT_PACKAGE_PREFIX:STRING='Qt6' \
        -DFORK_AWESOME_FONT_FILE='./forkawesome/fonts/forkawesome-webfont.woff2' \
        -DFORK_AWESOME_ICON_DEFINITIONS='./src/icons/icons.yml'

The licenses of the Fork-Awesome project should also be added to this package spec.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

So it took me an embarrasing amount of time to figure out that the reason the mkdir command wasn't being executed was because I didn't remove the | after setup :. After removing it, however, I'm getting mkdir: invalid option -- 'x'

I tried adding an empty line between mkdir and tar but that resulted in none of the cmake arguments going through.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Ah so it seems like mkdir + tar are both being fired as one command from the terminal output. How do i split them into two seperate commands

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think i've figured it out. The archive contains another folder with the version number attached to it. Adding that to the directory for the font file has fixed it

Copy link
Member

@EbonJaeger EbonJaeger Jan 31, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Hrm so when I was playing around earlier, I didn't notice that everything is in another top-level directory. I hate our tooling's handling of multiple sources... Or the lack thereof....

Let's try this:

Set the paths being passed to CMake to start with ./forkawesome/Fork-Awesome-1.2.0/ instead of just ./forkawesome. I hate it, and it's ugly, but I'm not sure that I care enough to mess with it more.

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Lemme think overnight on this, actually. I'm not convinced this is the best way.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Lemme think overnight on this, actually. I'm not convinced this is the best way.

any update on this?

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Sorry, I got very distracted by... Everything. Let's just add the individual files we need as sources. Make sure that they're being grabbed from a commit ref, and not the main branch. Then you can just copy them to the correct directory in the setup step without the jank of untarring.

%ninja_install

# Install Licence
%install_license LICENSE
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

There's also LICENSE.LESSER and LICENSE.MPL-2.0 that should be included.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I seemed to have missed that, my bad! I've added them now

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This will work, but they can all be added as one line :P

%install_license LICENSE*

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This will work, but they can all be added as one line :P

%install_license LICENSE*

Won't that also pull in "LICENSES-windows-distribution.md" which seems like it's specific to windows or does that not matter?

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Fair point. You can still add multiple files with the same macro call, though.

**Summary**

Add qtutilities which is a dependency for syncthingtray getsolus#7361
**Summary**

Add qtforkawesome which is a dependency for syncthingtray getsolus#7361
**Summary**

Adds syncthingtray. Resolves getsolus#7361
source :
- https://github.com/Martchus/qtforkawesome/archive/refs/tags/v0.3.2.tar.gz : 9215162e9dd73eb64047de5f2a21c654ce8e6df2994ebe558b7fd7a31b28bb52
homepage : https://github.com/Martchus/qtforkawesome
networking: true
Copy link
Member

@EbonJaeger EbonJaeger Jan 30, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Hmm Yeah, I would like the project's source tarball added as a source, and then moved to the right place.

source     :
    - https://github.com/Martchus/qtforkawesome/archive/refs/tags/v0.3.2.tar.gz : 9215162e9dd73eb64047de5f2a21c654ce8e6df2994ebe558b7fd7a31b28bb52
    - https://github.com/ForkAwesome/Fork-Awesome/archive/refs/tags/1.2.0.tar.gz#fork-awesome.tar.gz : whatever the sha256sum of  the downloaded file is
setup      : |
    mkdir forkawesome
    tar -xf ${sources}/fork-awesome.tar.gz -C forkawesome

    %cmake_ninja \
        -DBUILD_SHARED_LIBS=ON \
        -DQT_PACKAGE_PREFIX:STRING='Qt6' \
        -DFORK_AWESOME_FONT_FILE='./forkawesome/fonts/forkawesome-webfont.woff2' \
        -DFORK_AWESOME_ICON_DEFINITIONS='./src/icons/icons.yml'

The licenses of the Fork-Awesome project should also be added to this package spec.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

Status: Triage

Development

Successfully merging this pull request may close these issues.

Syncthing tray

3 participants